Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 8 Dec 2011 18:02:29 +0000 (10:02 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 8 Dec 2011 18:02:29 +0000 (10:02 -0800)
commitc80d79332964dbe3eaaf7c8b866e0d6ca382b841
tree5a64d8a644d555a6e64c1d1edf745432d94ad78f
parentc335f0e9257e0e2525eb3439412e7c38a8a94e26
parentc0c641999abe24143fba8d7a746b5b0527820d19
Merge from trunk.